From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 17 Jan 2011 22:09:25 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5157^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4b5730ed01195e9af2228c5222f67c1a4d2cdfdd;p=emacs.git

Merge from mainline.
---

4b5730ed01195e9af2228c5222f67c1a4d2cdfdd